From b4bfedc4be17c019fe7fe825e7028322200e0b23 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 13 Dec 2016 16:36:31 -0800 Subject: [PATCH] Fix git rev showing up in version number Makefiles didn't support an out-of-tree build, so needed to update them to do so. --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 89e3f2a31..20b656e2e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,11 +24,11 @@ endif CFG_BUILD_DATE = $(shell date +%F) -ifeq ($(wildcard .git),) +ifeq ($(wildcard $(CFG_SRC_DIR)/.git),) CFG_VERSION = $(CFG_RELEASE) (built $(CFG_BUILD_DATE)) else -CFG_VER_DATE = $(shell git log -1 --date=short --pretty=format:'%cd') -CFG_VER_HASH = $(shell git rev-parse --short HEAD) +CFG_VER_DATE = $(shell git --git-dir='$(CFG_SRC_DIR).git' log -1 --date=short --pretty=format:'%cd') +CFG_VER_HASH = $(shell git --git-dir='$(CFG_SRC_DIR).git' rev-parse --short HEAD) CFG_VERSION = $(CFG_RELEASE) ($(CFG_VER_HASH) $(CFG_VER_DATE)) endif PKG_NAME = cargo-$(CFG_PACKAGE_VERS) -- 2.30.2